From a4073b8088c702003fbda1144cf11fc571f30bef Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Mon, 24 May 2010 16:38:08 +0000
Subject: [PATCH] Follow up r62958. addToSidebar() was added in r59215, we
 still can redesign it and avoid legacy functions.

---
 includes/Skin.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 7ed2626a9e..aa0dc24cc9 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2104,7 +2104,7 @@ CSS;
 		}
 
 		$bar = array();
-		$this->addToSidebar( $bar, 'sidebar' );
+		$this->addToSidebar( $bar, wfMsgForContentNoTrans( 'sidebar' ) );
 
 		wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
 		if ( $wgEnableSidebarCache ) {
@@ -2113,26 +2113,16 @@ CSS;
 		wfProfileOut( __METHOD__ );
 		return $bar;
 	}
-	/**
-	 * Add content from a sidebar system message
-	 * Currently only used for MediaWiki:Sidebar (but may be used by Extensions)
-	 *
-	 * This is just a wrapper around addToSidebarPlain() for backwards compatibility
-	 * 
-	 * @param &$bar array
-	 * @param $message String
-	 */
-	function addToSidebar( &$bar, $message ) {
-		$this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
-	}
 	
 	/**
-	 * Add content from plain text
-	 * @since 1.17
+	 * Add content to the sidebar from text
+	 * @since 1.16
 	 * @param &$bar array
 	 * @param $text string
+	 * 
+	 * @return array
 	 */
-	function addToSidebarPlain( &$bar, $text ) {
+	function addToSidebar( &$bar, $text ) {
 		$lines = explode( "\n", $text );
 		$heading = '';
 		foreach( $lines as $line ) {
-- 
2.20.1